Updates and stuff
Reverted to old scanner mechanism