Fixed token check + Lab 3, Exercise 3