Added both fixed points and autolocation.