Small changes /JRAPP