Changes from walkthrough with @jnimety