Various modifications2