final updates for stable simple implementation