Final changes for now (Those will be the proprietary files for 4.4 too)