I added stuff... and a lot of it