added stuff, still faulty