latest code
fixed bugs
fixed bugs