still had a small bug, running now