Added final part of assignment