Updated to remove php notices