added changes to handler