ok. we should not mix it into this PR, it can be done later without needing to alter the db.