Complete reconstruction, cleaner interface