Final modifications... already uploaded the homework