Added a few bits and piece