Upgraded for php 5.3 compatibilty