minor changes to functionality