Updated code to work with latest upstream