Vegas Murphy - Java changes