17.5.14 change to onReady