BEINGME-283 finally arrange properly