Full JS behavior added