Added draw method bodies