fix order and remove var so it will work as copied