Revert noob changes

Revert noob changes

issue #23