some changes v1...