Modifications by revinder