Reverting last commit but keeping a few changes to var names