Apply changes made by Roland