Minor improvement with the new exerceises