simpfand-git: updated