Final changes for X