Add timing
Fix momentum