Listener done in better way