sdb-enhanced: adding changes, moving things