do some changes on desing
merge