updated class structure, updated variable set and color scheme