Several modifications.