working on bug
minor changes
minor changes