fixing buggs
aftermerging