minor changes in functionality