reset to previous version, my implementation will be in another branch to avoid confusion/messing up working code