Changes to make code run on CIT