Updated to use the better draw system.