fix space, add databass