Solution

went with a mix of both solutions