added some cool stuf from spf13