Re-add normalize and header, make clock smaller