Daanish Changes from error list