Adding a few more bits and pieces