some changes in transitions and loading