functions 1, 2 fixed
trigger 1 fixed