Made several significant changes.