@ not working, refactoring another way