adding changes from altbo.g.io