updated to r-60 and removed extra sources