last changes use this as presentation
merge