Updated to include checks

Checks to make sure it works