Smelly js, don't use
Merge conlflicts fixed