Fix intendance n shit