It's working
minor changes