Revert "changed interfaces"

This reverts commit 023c888995e6ead400ab77fd9e2f66574253fdf1.
refactoring