working ruby to js fen
merge conficts again