Tried removing flow logic