Update for Better Performance (But... Be careful Brick!)