added a bunch of stuff lost count