Updated for OH 1.6