changed variabes' names