some integration with galbase
minor merge