Added color locking.