Added quite a few things