these three lines should also be removed, I guess