Consolidating some changes