refactor spec
refactor spec
update for release