Added corporate, fixed regression
fixed merge conflicts