Block by block

@amazon