master did different thing to the new feature to one file