Added smooth loading