Fixed fuel registration, moved around orediction