few more changes to make things work if valon is unavailable