@dideler refer to updated PR description