Incorporate latest code needed by our app