UPDATE: Refactoring & Toast msj added