modifications to functionality