Minor changes to handler