Perfs

May solve #2
Not tested