#5 Changes according to reject comments