Working max per block

Change-Id: Idc52a9349dddc7fb6084e009bcb0826627c92740