Modified run loop