Merged code from private repo