first throw at changing syntax once again.
Further refactoring