Added program and startup logic