changed logic after user add