code otimized and add assets
version with merging