Converted to double-based location system