Some last trying modifications