changing interface and renaming a few things