Organization logic updated