fixing user flows