changes
fixed crucial bug