Updated check if running