made some structural adjustments to 1.3.3