put in create setup
fixed a refactor
Merge branch 'master' into ticket-144