Updated checks and gulp file