Finished exercises 3.5 with additional configurations