working version with less files