Q2 + Got Rid of Unnecessary Code