Finished implementing new grphics