Added smooth transitions