added alla function, now do bugfixing