Added good stuff from spf13