Made changes and added flow