New branch for merging features
corrections were made