Reduce server requests by eof and bof alignment

Tests passed!