work on deferral until next handler
remove unused components
remove unused components
reworked deferral
deferrals work better