Changed API from 18 to 16 to meet assignment spec.