haddocks working now, remove note