Robocop style updates