major changes, trying to make it work and not sending heap space