variabe name changes & little bug