combining code for deliverable