update 2
fixed problems