add right aside
update right side
merge mjj branch