Tidy up - use original function def