Few more bits

completed