adding final touches on handler