Starwood plans split

Issue 1158