Fixed Adam and PJ's mistakes