Changes from the beginner tutorial