updated users and fields flow working