[DEV] Improve linear location control