Modifications to functionality