Works with Ben's changes now