Moved logic into the builder
removed parameter