MA:Initial commit for move from server