Changes for online 2d