Move to a more appropriate location