Updated to use (c) and test changes