Check1 refactor

Checking in @armendariz's changes :+1: