Applying the changes suggested by Og