Working on dive component