Modifications to allow for easier testing and debugging