#112 updates