Tasks 3-5 added