ok, force pushed cleaned up code