Sup hooks
Small improvs
Adding sup