Space fixes
Change interface