merging Dev james