added rs2, minor changes