Feature/adam latest