Final changes for stable