Some signature changes - still have some tests to pass