removed @ from var names