Bug Fix & Reduced # of vars