resolved conflicts with new API