refactored specs and code before parking