final commit q7 working