other try with minor changes after going back one commit
solved conflict