[jira] [Commented] (YARN-3508) Prevent processing preemption events on the main RM dispatcher

2015-07-02 Thread Varun Saxena (JIRA)
[ https://issues.apache.org/jira/browse/YARN-3508?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14611716#comment-14611716 ] Varun Saxena commented on YARN-3508: [~leftnoteasy], updated patch for branch-2.7

[jira] [Updated] (YARN-3508) Prevent processing preemption events on the main RM dispatcher

2015-07-02 Thread Varun Saxena (JIRA)
[ https://issues.apache.org/jira/browse/YARN-3508?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Varun Saxena updated YARN-3508: --- Attachment: YARN-3508-branch-2.7.01.patch Prevent processing preemption events on the main RM

[jira] [Updated] (YARN-2681) Support bandwidth enforcement for containers while reading from HDFS

2015-07-02 Thread cntic (JIRA)
[ https://issues.apache.org/jira/browse/YARN-2681?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] cntic updated YARN-2681: Attachment: YARN-2681.patch Support bandwidth enforcement for containers while reading from HDFS

[jira] [Updated] (YARN-3878) AsyncDispatcher can hang while stopping if it is configured for draining events on stop

2015-07-02 Thread Varun Saxena (JIRA)
[ https://issues.apache.org/jira/browse/YARN-3878?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Varun Saxena updated YARN-3878: --- Attachment: YARN-3878.02.patch AsyncDispatcher can hang while stopping if it is configured for

[jira] [Updated] (YARN-3877) YarnClientImpl.submitApplication swallows exceptions

2015-07-02 Thread Varun Saxena (JIRA)
[ https://issues.apache.org/jira/browse/YARN-3877?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Varun Saxena updated YARN-3877: --- Attachment: YARN-3877.01.patch YarnClientImpl.submitApplication swallows exceptions

[jira] [Updated] (YARN-3840) Resource Manager web ui issue when sorting application by id (with application having id 9999)

2015-07-02 Thread Mohammad Shahid Khan (JIRA)
[ https://issues.apache.org/jira/browse/YARN-3840?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Mohammad Shahid Khan updated YARN-3840: --- Attachment: YARN-3840-5.patch Resource Manager web ui issue when sorting application

[jira] [Updated] (YARN-3878) AsyncDispatcher can hang while stopping if it is configured for draining events on stop

2015-07-02 Thread Varun Saxena (JIRA)
[ https://issues.apache.org/jira/browse/YARN-3878?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Varun Saxena updated YARN-3878: --- Attachment: YARN-3878.02.patch [~jianhe], added a test case AsyncDispatcher can hang while stopping

[jira] [Updated] (YARN-3846) RM Web UI queue filter is not working

2015-07-02 Thread Mohammad Shahid Khan (JIRA)
[ https://issues.apache.org/jira/browse/YARN-3846?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Mohammad Shahid Khan updated YARN-3846: --- Attachment: YARN-3846.patch Please review attached patch RM Web UI queue filter is

[jira] [Updated] (YARN-3840) Resource Manager web ui issue when sorting application by id (with application having id 9999)

2015-07-02 Thread Mohammad Shahid Khan (JIRA)
[ https://issues.apache.org/jira/browse/YARN-3840?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Mohammad Shahid Khan updated YARN-3840: --- Attachment: YARN-3840-4.patch Attached patch having test cases Resource Manager web

[jira] [Updated] (YARN-3878) AsyncDispatcher can hang while stopping if it is configured for draining events on stop

2015-07-02 Thread Varun Saxena (JIRA)
[ https://issues.apache.org/jira/browse/YARN-3878?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Varun Saxena updated YARN-3878: --- Attachment: (was: YARN-3878.02.patch) AsyncDispatcher can hang while stopping if it is configured

[jira] [Updated] (YARN-3846) RM Web UI queue filter is not working

2015-07-02 Thread Mohammad Shahid Khan (JIRA)
[ https://issues.apache.org/jira/browse/YARN-3846?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Mohammad Shahid Khan updated YARN-3846: --- Labels: PatchAvailable (was: ) Not adding any test case Change is only js code. RM

[jira] [Updated] (YARN-3849) Too much of preemption activity causing continuos killing of containers across queues

2015-07-02 Thread Sunil G (JIRA)
[ https://issues.apache.org/jira/browse/YARN-3849?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Sunil G updated YARN-3849: -- Attachment: 0003-YARN-3849.patch Thank you [~leftnoteasy] for the comments. Uploading a patch addressing the

[jira] [Commented] (YARN-3878) AsyncDispatcher can hang while stopping if it is configured for draining events on stop

2015-07-02 Thread Jian He (JIRA)
[ https://issues.apache.org/jira/browse/YARN-3878?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14612511#comment-14612511 ] Jian He commented on YARN-3878: --- ah, sorry, I overlooked. lgtm, thanks ! AsyncDispatcher

[jira] [Commented] (YARN-3815) [Aggregation] Application/Flow/User/Queue Level Aggregations

2015-07-02 Thread Sangjin Lee (JIRA)
[ https://issues.apache.org/jira/browse/YARN-3815?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14612678#comment-14612678 ] Sangjin Lee commented on YARN-3815: --- {quote} We may consider to provide two ways here: -

[jira] [Commented] (YARN-3815) [Aggregation] Application/Flow/User/Queue Level Aggregations

2015-07-02 Thread Junping Du (JIRA)
[ https://issues.apache.org/jira/browse/YARN-3815?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14612687#comment-14612687 ] Junping Du commented on YARN-3815: -- Thanks [~sjlee0] for comments! bq. I think it is

[jira] [Commented] (YARN-3881) Writing RM cluster-level metrics

2015-07-02 Thread Zhijie Shen (JIRA)
[ https://issues.apache.org/jira/browse/YARN-3881?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14612638#comment-14612638 ] Zhijie Shen commented on YARN-3881: --- Once the metrics are ready, we can build

[jira] [Commented] (YARN-433) When RM is catching up with node updates then it should not expire acquired containers

2015-07-02 Thread Anubhav Dhoot (JIRA)
[ https://issues.apache.org/jira/browse/YARN-433?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14612651#comment-14612651 ] Anubhav Dhoot commented on YARN-433: LGTM When RM is catching up with node updates

[jira] [Commented] (YARN-3815) [Aggregation] Application/Flow/User/Queue Level Aggregations

2015-07-02 Thread Sangjin Lee (JIRA)
[ https://issues.apache.org/jira/browse/YARN-3815?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14612798#comment-14612798 ] Sangjin Lee commented on YARN-3815: --- {quote} We don't have to make it at container level

[jira] [Commented] (YARN-2923) Support configuration based NodeLabelsProvider Service in Distributed Node Label Configuration Setup

2015-07-02 Thread Dian Fu (JIRA)
[ https://issues.apache.org/jira/browse/YARN-2923?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14612805#comment-14612805 ] Dian Fu commented on YARN-2923: --- {quote}But would also would like to get inputs from other

[jira] [Commented] (YARN-3815) [Aggregation] Application/Flow/User/Queue Level Aggregations

2015-07-02 Thread Sangjin Lee (JIRA)
[ https://issues.apache.org/jira/browse/YARN-3815?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14612684#comment-14612684 ] Sangjin Lee commented on YARN-3815: --- {quote} The use case here should be obviously. A

[jira] [Commented] (YARN-313) Add Admin API for supporting node resource configuration in command line

2015-07-02 Thread Inigo Goiri (JIRA)
[ https://issues.apache.org/jira/browse/YARN-313?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14612702#comment-14612702 ] Inigo Goiri commented on YARN-313: -- Up to you [~djp], you did the work. I'm just trying to

[jira] [Commented] (YARN-3815) [Aggregation] Application/Flow/User/Queue Level Aggregations

2015-07-02 Thread Sangjin Lee (JIRA)
[ https://issues.apache.org/jira/browse/YARN-3815?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14612680#comment-14612680 ] Sangjin Lee commented on YARN-3815: --- bq. This way sounds very clever. In addition, if we

[jira] [Updated] (YARN-3882) AggregatedLogFormat should close aclScanner and ownerScanner after create them.

2015-07-02 Thread zhihai xu (JIRA)
[ https://issues.apache.org/jira/browse/YARN-3882?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] zhihai xu updated YARN-3882: Attachment: YARN-3882.000.patch AggregatedLogFormat should close aclScanner and ownerScanner after create

[jira] [Created] (YARN-3883) YarnClient.getApplicationReport() doesn't not give diagnostics for the FINISHED state applications some times

2015-07-02 Thread Devaraj K (JIRA)
Devaraj K created YARN-3883: --- Summary: YarnClient.getApplicationReport() doesn't not give diagnostics for the FINISHED state applications some times Key: YARN-3883 URL: https://issues.apache.org/jira/browse/YARN-3883

[jira] [Assigned] (YARN-3883) YarnClient.getApplicationReport() doesn't not give diagnostics for the FINISHED state applications some times

2015-07-02 Thread Brahma Reddy Battula (JIRA)
[ https://issues.apache.org/jira/browse/YARN-3883?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Brahma Reddy Battula reassigned YARN-3883: -- Assignee: Brahma Reddy Battula YarnClient.getApplicationReport() doesn't not

[jira] [Commented] (YARN-3883) YarnClient.getApplicationReport() doesn't not give diagnostics for the FINISHED state applications some times

2015-07-02 Thread Brahma Reddy Battula (JIRA)
[ https://issues.apache.org/jira/browse/YARN-3883?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14612865#comment-14612865 ] Brahma Reddy Battula commented on YARN-3883: [~devaraj.k] I would like to work

[jira] [Commented] (YARN-3815) [Aggregation] Application/Flow/User/Queue Level Aggregations

2015-07-02 Thread Junping Du (JIRA)
[ https://issues.apache.org/jira/browse/YARN-3815?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14612648#comment-14612648 ] Junping Du commented on YARN-3815: -- bq. Also, it would be GREAT if you could give a clear

[jira] [Commented] (YARN-2923) Support configuration based NodeLabelsProvider Service in Distributed Node Label Configuration Setup

2015-07-02 Thread Naganarasimha G R (JIRA)
[ https://issues.apache.org/jira/browse/YARN-2923?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14612706#comment-14612706 ] Naganarasimha G R commented on YARN-2923: - Thanks [~dian.fu], for the review. But

[jira] [Created] (YARN-3882) AggregatedLogFormat should close aclScanner and ownerScanner after create them.

2015-07-02 Thread zhihai xu (JIRA)
zhihai xu created YARN-3882: --- Summary: AggregatedLogFormat should close aclScanner and ownerScanner after create them. Key: YARN-3882 URL: https://issues.apache.org/jira/browse/YARN-3882 Project: Hadoop

[jira] [Commented] (YARN-3878) AsyncDispatcher can hang while stopping if it is configured for draining events on stop

2015-07-02 Thread Devaraj K (JIRA)
[ https://issues.apache.org/jira/browse/YARN-3878?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14612729#comment-14612729 ] Devaraj K commented on YARN-3878: - Thanks [~varun_saxena] for the patch and [~jianhe] for

[jira] [Updated] (YARN-313) Add Admin API for supporting node resource configuration in command line

2015-07-02 Thread Inigo Goiri (JIRA)
[ https://issues.apache.org/jira/browse/YARN-313?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Inigo Goiri updated YARN-313: - Attachment: YARN-313-v5.patch Fixed checkstyle (the ones that I could and made sense) Fixed one unit test

[jira] [Commented] (YARN-3883) YarnClient.getApplicationReport() doesn't not give diagnostics for the FINISHED state applications some times

2015-07-02 Thread Devaraj K (JIRA)
[ https://issues.apache.org/jira/browse/YARN-3883?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14612857#comment-14612857 ] Devaraj K commented on YARN-3883: - It is occurring due to this reason, While creating

[jira] [Commented] (YARN-2004) Priority scheduling support in Capacity scheduler

2015-07-02 Thread Sunil G (JIRA)
[ https://issues.apache.org/jira/browse/YARN-2004?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14612159#comment-14612159 ] Sunil G commented on YARN-2004: --- Thank you [~jianhe] for the comments. - bq.Or this method

[jira] [Created] (YARN-3880) Writing more RM side app-level metrics

2015-07-02 Thread Zhijie Shen (JIRA)
Zhijie Shen created YARN-3880: - Summary: Writing more RM side app-level metrics Key: YARN-3880 URL: https://issues.apache.org/jira/browse/YARN-3880 Project: Hadoop YARN Issue Type: Sub-task

[jira] [Commented] (YARN-3047) [Data Serving] Set up ATS reader with basic request serving structure and lifecycle

2015-07-02 Thread Varun Saxena (JIRA)
[ https://issues.apache.org/jira/browse/YARN-3047?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14612307#comment-14612307 ] Varun Saxena commented on YARN-3047: Updated a new patch. [~sjlee0], [~zjshen], kindly

[jira] [Updated] (YARN-3047) [Data Serving] Set up ATS reader with basic request serving structure and lifecycle

2015-07-02 Thread Varun Saxena (JIRA)
[ https://issues.apache.org/jira/browse/YARN-3047?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Varun Saxena updated YARN-3047: --- Attachment: YARN-3047-YARN-2928.10.patch [Data Serving] Set up ATS reader with basic request serving

[jira] [Commented] (YARN-3051) [Storage abstraction] Create backing storage read interface for ATS readers

2015-07-02 Thread Varun Saxena (JIRA)
[ https://issues.apache.org/jira/browse/YARN-3051?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14612117#comment-14612117 ] Varun Saxena commented on YARN-3051: Ok...Will make the change [Storage abstraction]

[jira] [Updated] (YARN-3849) Too much of preemption activity causing continuos killing of containers across queues

2015-07-02 Thread Sunil G (JIRA)
[ https://issues.apache.org/jira/browse/YARN-3849?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Sunil G updated YARN-3849: -- Attachment: 0004-YARN-3849.patch Yes [~leftnoteasy] . You are correct, thanks for pointing out. I update the

[jira] [Commented] (YARN-3051) [Storage abstraction] Create backing storage read interface for ATS readers

2015-07-02 Thread Zhijie Shen (JIRA)
[ https://issues.apache.org/jira/browse/YARN-3051?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14612113#comment-14612113 ] Zhijie Shen commented on YARN-3051: --- 2. I meant we store appId, user, flowId, flowRunId

[jira] [Commented] (YARN-3849) Too much of preemption activity causing continuos killing of containers across queues

2015-07-02 Thread Wangda Tan (JIRA)
[ https://issues.apache.org/jira/browse/YARN-3849?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14612187#comment-14612187 ] Wangda Tan commented on YARN-3849: -- [~sunilg], Thanks for update, but

[jira] [Updated] (YARN-3881) Writing RM cluster-level metrics

2015-07-02 Thread Zhijie Shen (JIRA)
[ https://issues.apache.org/jira/browse/YARN-3881?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Zhijie Shen updated YARN-3881: -- Attachment: metrics.json Writing RM cluster-level metrics

[jira] [Commented] (YARN-3878) AsyncDispatcher can hang while stopping if it is configured for draining events on stop

2015-07-02 Thread Jian He (JIRA)
[ https://issues.apache.org/jira/browse/YARN-3878?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14612320#comment-14612320 ] Jian He commented on YARN-3878: --- Hi [~varun_saxena], the test seems not adequate. It doesn't

[jira] [Commented] (YARN-3878) AsyncDispatcher can hang while stopping if it is configured for draining events on stop

2015-07-02 Thread Varun Saxena (JIRA)
[ https://issues.apache.org/jira/browse/YARN-3878?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14612342#comment-14612342 ] Varun Saxena commented on YARN-3878: [~jianhe], the test case as such is adequate. I

[jira] [Created] (YARN-3881) Writing RM cluster-level metrics

2015-07-02 Thread Zhijie Shen (JIRA)
Zhijie Shen created YARN-3881: - Summary: Writing RM cluster-level metrics Key: YARN-3881 URL: https://issues.apache.org/jira/browse/YARN-3881 Project: Hadoop YARN Issue Type: Sub-task

[jira] [Commented] (YARN-3881) Writing RM cluster-level metrics

2015-07-02 Thread Zhijie Shen (JIRA)
[ https://issues.apache.org/jira/browse/YARN-3881?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14612429#comment-14612429 ] Zhijie Shen commented on YARN-3881: --- IMHO, we need to add an addition API to direct write

[jira] [Commented] (YARN-3881) Writing RM cluster-level metrics

2015-07-02 Thread Lei Guo (JIRA)
[ https://issues.apache.org/jira/browse/YARN-3881?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14612432#comment-14612432 ] Lei Guo commented on YARN-3881: --- This is an interesting topic, assuming the timeline server

[jira] [Updated] (YARN-3815) [Aggregation] Application/Flow/User/Queue Level Aggregations

2015-07-02 Thread Sangjin Lee (JIRA)
[ https://issues.apache.org/jira/browse/YARN-3815?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Sangjin Lee updated YARN-3815: -- Attachment: hbase-schema-proposal-for-aggregation.pdf aggregation-design-discussion.pdf

[jira] [Updated] (YARN-313) Add Admin API for supporting node resource configuration in command line

2015-07-02 Thread Junping Du (JIRA)
[ https://issues.apache.org/jira/browse/YARN-313?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Junping Du updated YARN-313: Labels: (was: BB2015-05-TBR) Add Admin API for supporting node resource configuration in command line

[jira] [Commented] (YARN-313) Add Admin API for supporting node resource configuration in command line

2015-07-02 Thread Junping Du (JIRA)
[ https://issues.apache.org/jira/browse/YARN-313?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14612553#comment-14612553 ] Junping Du commented on YARN-313: - Sorry for coming on this. [~elgoiri], are you interested

[jira] [Commented] (YARN-3815) [Aggregation] Application/Flow/User/Queue Level Aggregations

2015-07-02 Thread Sangjin Lee (JIRA)
[ https://issues.apache.org/jira/browse/YARN-3815?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14612592#comment-14612592 ] Sangjin Lee commented on YARN-3815: --- Here is my take on what's consensus, what's not, and

[jira] [Commented] (YARN-3815) [Aggregation] Application/Flow/User/Queue Level Aggregations

2015-07-02 Thread Junping Du (JIRA)
[ https://issues.apache.org/jira/browse/YARN-3815?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14612591#comment-14612591 ] Junping Du commented on YARN-3815: -- Thanks [~sjlee0] for nice writeup on the discussions.

[jira] [Commented] (YARN-3815) [Aggregation] Application/Flow/User/Queue Level Aggregations

2015-07-02 Thread Sangjin Lee (JIRA)
[ https://issues.apache.org/jira/browse/YARN-3815?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14612529#comment-14612529 ] Sangjin Lee commented on YARN-3815: --- Some of us ([~gtCarrera9], [~vinodkv], [~djp],

[jira] [Commented] (YARN-3445) Cache runningApps in RMNode for getting running apps on given NodeId

2015-07-02 Thread Junping Du (JIRA)
[ https://issues.apache.org/jira/browse/YARN-3445?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14612543#comment-14612543 ] Junping Du commented on YARN-3445: -- Thanks for review and comments, [~mingma]! bq. That is

[jira] [Commented] (YARN-3815) [Aggregation] Application/Flow/User/Queue Level Aggregations

2015-07-02 Thread Junping Du (JIRA)
[ https://issues.apache.org/jira/browse/YARN-3815?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14612620#comment-14612620 ] Junping Du commented on YARN-3815: -- bq. app-level aggregation for framework-specific

[jira] [Commented] (YARN-3815) [Aggregation] Application/Flow/User/Queue Level Aggregations

2015-07-02 Thread Sangjin Lee (JIRA)
[ https://issues.apache.org/jira/browse/YARN-3815?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14612629#comment-14612629 ] Sangjin Lee commented on YARN-3815: --- For gauges and their averages and max in particular,

[jira] [Updated] (YARN-3866) AM-RM protocol changes to support container resizing

2015-07-02 Thread MENG DING (JIRA)
[ https://issues.apache.org/jira/browse/YARN-3866?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] MENG DING updated YARN-3866: Attachment: YARN-3866.2.patch Attached new patch based on the review comments. 1) Moved most of the PB