changed varible names