Updated and ready to test on cs machines