Re-added newlines and some mock functions