Re-added changes