JB Changes to application