#43 - latest code and schema