more funkiness (probably should revert craziness)