Use correct variables and such