Adapting to jQuery 2
Adapting to APC