adding setReady function
merge