MErging with jihoon changes