changes to handler