reverted to Joël's original crazy way of doing things :)