minor changes to use