modif before forking js and merging coffee into master