changed var names