fixing my bad js from previous commit
Merge branch 'feature'