Unified2xff v3

Comments have been addressed.