Fixes + Use of new API