changed defines, redefined clip locations