Added a new way of checking, and instant updates