Various modifications...