Some buggy changes

This need ti dischange.