Changes to prepare for RAS project going into production