tommy work, to check and add
conflicts solved after merge