dev logic update