went back to the old code after reconsidering :P