added return from handlers