rewrote initialisation, added testing workaround