BOD-1: PATCH 0.2

PATCH 0.2