Added a few things