Revamp to be a bit clearer to beginners like me