updates to handler