base a bit changed

Will finish it later...