Several modifications