JS changed to OO