redone some js