Synchronized with latest improvements