added changes as part of the exercises