Finnly working on 6.5