Merge with Adima
finishing merge with collins