Changing some way to work