Moved back all code for variations and color