now in a better location