Merge Abdullah code