changes made by Shalin