Updated adjoint
Merging some changes from master.