changed made based on ass 1 feedback