More chnages

R tested