Changed var names: now more understandable