Added more smooth transitions