Added a few thing