UPdated some var names