Adding feedback from ibbe and micael