changed to some conventional changes