rewore exercises to angular, add 2 exercises