updated for handler