Review on latest commit
Review made by SvinSimpe