code update
merge stuff and stuff