minor changes
changes to make it work