Token and checks added