Changing flow. Not working yet.
fixing merge