Applying changes as suggested by Mark