2021 Design & Code update by PixelTiger