WIP changed optional params to have no defaults