Board main contents

second merge