Re-added previous changes made due to issues with github sync.