refactored the specs