Integrate feedback from Gebi, please review again :)