removed more double markup, nead to leave now..