Updated for EAK and gulp!