Hacked to work.. :)