changing madd and mget logic