second phase features implemented