Updated drawing scheme