Copied some old sifi Redmine code over