Added GPS fake & rebased