MAC Fix + Review