changes so new API can be used