ass5: merged Chris' changes