removed conditions from has_one_options