Few more bits i missed originally