merging stuff
merged and added stuff so tired ....