Added draw and display functions