desperate attempt at testing + little changes