final commit before implementation of Loi's design