Changes after mentor took a look