Production

Update of my branch for further work!