need to change vairable names to match