Added stuff for automated checking