Adding the lock and removing hoptoad.