attention map added, reorganized structure