UPDATE - v.1.3+ for Brick + Mason