-*-ray-*- readded *r.java :/