copied parts

copied parts to test merge