Changes as per Andre's comments