Completed essential 3
merging branches