stable updates and code consolidation