edited variables to nazifa's specifications