Added success message
Removed autoscreen