add the stuff ignored in the official tuto