New update created few bugs