Added additional specs and logic