added rest of homework