Hacked to work with our req's...