updating code to comply with oracle ruling