Further updates to make this compatible with develop