Added Phase 3 funtionality.