jquery updated, need to refactor