Added a few more bits