merged somethings manually