Modifications for testing and debug