Added a couple more bits