Added rcs-controller - removed some comments