added * variables. bit of refactoring