matching code to new skin