added some stuff for 1b
merge stuff for 1b