tried my hand at some better syntax. not so sure about this one :)