Major corrections via new API