Added draw selector