Added/modified functions.