CSM349 Fixed, Java file checked in