Removed some stuff to make the exercises more challenging.