test
fixed
changed logic