Complete overhaul of frame hooks