Fixed annotation errors.
Purchase implementation and testing