add maginds and other changes