OK, since the current solution works, lets keep this simple for now!