Setup - Replaced temp code with a slightly better directive ... wish I knew a better way though.