Merging whale skip fix from Mads
Added mads skipping fix