Tidying up, adding other three bytes to count