applied some changes for updated spf13