Reworked system checks