modifications by Mick