removing a lot, but adding stuff