Interface added, only need to clean it up