Updates towards joint optimization

Yoshikawa and Chiu added