WIP: Changes requested by Igor