Updated to new fuller api