Updated code to work against master