still working on database compatibility