test
merged and fixed the bugs