added a few more bits