Final modifications for the final project