some rejection code
merge fix
map integrated