Modification to several HO and Brick