specs refactored. :)