master - changed references to simple from static