updated code to new oj standards