tweaks after testing this code in rowlf
refactoring specs