Added some workout flow logic