its working but too long
many changes
Merge branch 'feature/blogissues' into develop