conflict solved with last slide implementation2