Starting to address johu review comments