Updated gulpFile and its behaviour