2x improvements