diff --git a/libr/anal/anal.c b/libr/anal/anal.c
index 6d32898488..c53ad00cf4 100644
--- a/libr/anal/anal.c
+++ b/libr/anal/anal.c
@@ -48,10 +48,10 @@ int r_anal_set(struct r_anal_t *anal, const char *name)
 	return R_FALSE;
 }
 
-int r_anal_aop(struct r_anal_t *anal, struct r_asm_t *data, struct r_anal_aop_t *aop)
+int r_anal_aop(struct r_anal_t *anal, struct r_anal_aop_t *aop, void *data)
 { 
 	if (anal->cur && anal->cur->aop)
-		return anal->cur->aop(data, aop);
+		return anal->cur->aop(aop, data);
 	return R_FALSE;
 }
 
diff --git a/libr/anal/p/anal_dummy.c b/libr/anal/p/anal_dummy.c
index 1b2ada4867..432c711608 100644
--- a/libr/anal/p/anal_dummy.c
+++ b/libr/anal/p/anal_dummy.c
@@ -2,10 +2,9 @@
 
 #include <r_types.h>
 #include <r_lib.h>
-#include <r_asm.h>
 #include <r_anal.h>
 
-static int aop(struct r_asm_t *data, struct r_anal_aop_t *aop)
+static int aop(struct r_anal_aop_t *aop, void *data)
 {
 	printf("Dummy analysis plugin");
 
diff --git a/libr/anal/p/anal_x86.c b/libr/anal/p/anal_x86.c
index f79006b8c0..fdd845e87f 100644
--- a/libr/anal/p/anal_x86.c
+++ b/libr/anal/p/anal_x86.c
@@ -23,9 +23,10 @@
 
 // NOTE: buf should be at least 16 bytes!
 // XXX addr should be off_t for 64 love
-static int aop(struct r_asm_t *data, struct r_anal_aop_t *aop)
+static int aop(struct r_anal_aop_t *aop, void *data)
 {
-	u8 *buf = data->buf;
+	struct r_asm_t *asmdata = (struct r_asm_t*)data;
+	u8 *buf = asmdata->buf;
 
 	memset(aop, '\0', sizeof(struct r_anal_aop_t));
 	aop->type = R_ANAL_AOP_TYPE_UNK;
@@ -122,8 +123,8 @@ static int aop(struct r_asm_t *data, struct r_anal_aop_t *aop)
 		} else
 		if (buf[1]>=0x80 && buf[1]<=0x8f) {
 			aop->type   = R_ANAL_AOP_TYPE_CJMP;
-			aop->jump   = data->pc+6+buf[2]+(buf[3]<<8)+(buf[4]<<16)+(buf[5]<<24);//((unsigned long)((buf+2))+6);
-			aop->fail   = data->pc+6;
+			aop->jump   = asmdata->pc+6+buf[2]+(buf[3]<<8)+(buf[4]<<16)+(buf[5]<<24);//((unsigned long)((buf+2))+6);
+			aop->fail   = asmdata->pc+6;
 			aop->length = 6;
 			//aop->eob    = 1;
 		} 
@@ -141,24 +142,24 @@ static int aop(struct r_asm_t *data, struct r_anal_aop_t *aop)
 	case 0xe8: // call
 		aop->type   = R_ANAL_AOP_TYPE_CALL;
 		aop->length = 5;
-		//aop->jump   = data->pc+*ptr+5; //(unsigned long)((buf+1)+5);
-		aop->jump   = data->pc+5+buf[1]+(buf[2]<<8)+(buf[3]<<16)+(buf[4]<<24);//((unsigned long)((buf+2))+6);
-		aop->fail   = data->pc+5;
-//printf("data->pc: %08llx\n call %08llx \n ret %08llx\n", data->pc, aop->jump, aop->fail);
+		//aop->jump   = asmdata->pc+*ptr+5; //(unsigned long)((buf+1)+5);
+		aop->jump   = asmdata->pc+5+buf[1]+(buf[2]<<8)+(buf[3]<<16)+(buf[4]<<24);//((unsigned long)((buf+2))+6);
+		aop->fail   = asmdata->pc+5;
+//printf("asmdata->pc: %08llx\n call %08llx \n ret %08llx\n", asmdata->pc, aop->jump, aop->fail);
 	//	aop->eob    = 1;
 		break;
 	case 0xe9: // jmp
 		aop->type   = R_ANAL_AOP_TYPE_JMP;
 		aop->length = 5;
 		//aop->jump   = (unsigned long)((buf+1)+5);
-		aop->jump   = data->pc+5+buf[1]+(buf[2]<<8)+(buf[3]<<16)+(buf[4]<<24);//((unsigned long)((buf+2))+6);
+		aop->jump   = asmdata->pc+5+buf[1]+(buf[2]<<8)+(buf[3]<<16)+(buf[4]<<24);//((unsigned long)((buf+2))+6);
 		aop->fail   = 0L;
 		aop->eob    = 1;
 		break;
 	case 0xeb: // short jmp 
 		aop->type   = R_ANAL_AOP_TYPE_JMP;
 		aop->length = 2;
-		aop->jump   = data->pc+((unsigned long)((char)buf[1])+2);
+		aop->jump   = asmdata->pc+((unsigned long)((char)buf[1])+2);
 		aop->fail   = 0L;
 		aop->eob    = 1;
 		break;
@@ -189,7 +190,7 @@ static int aop(struct r_asm_t *data, struct r_anal_aop_t *aop)
 			aop->length = 2;
 			aop->eob    = 1;
 			//aop->jump   = vm_arch_x86_regs[VM_X86_EAX+buf[1]-0xd0];
-			aop->fail   = data->pc+2;
+			aop->fail   = asmdata->pc+2;
 		} else
 		if (buf[1]>=0xe0 && buf[1]<=0xe7) {
 			aop->type = R_ANAL_AOP_TYPE_UJMP;
@@ -318,34 +319,34 @@ static int aop(struct r_asm_t *data, struct r_anal_aop_t *aop)
 
 	case 0xa1: // mov eax, [addr]
 		aop->type = R_ANAL_AOP_TYPE_MOV;
-		//vm_arch_x86_regs[VM_X86_EAX] = data->pc+buf[1]+(buf[2]<<8)+(buf[3]<<16)+(buf[4]<<24);
+		//vm_arch_x86_regs[VM_X86_EAX] = asmdata->pc+buf[1]+(buf[2]<<8)+(buf[3]<<16)+(buf[4]<<24);
 		//radare_read_at((u64)vm_arch_x86_regs[VM_X86_EAX], (unsigned char *)&(vm_arch_x86_regs[VM_X86_EAX]), 4);
 		break;
 		
 	// roll to a switch range case
 	case 0xb8: // mov eax, <inmedate>
 		aop->type = R_ANAL_AOP_TYPE_MOV;
-		//vm_arch_x86_regs[VM_X86_EAX] = data->pc+buf[1]+(buf[2]<<8)+(buf[3]<<16)+(buf[4]<<24);
+		//vm_arch_x86_regs[VM_X86_EAX] = asmdata->pc+buf[1]+(buf[2]<<8)+(buf[3]<<16)+(buf[4]<<24);
 		break;
 	case 0xb9: // mov ecx, <inmedate>
 		aop->type = R_ANAL_AOP_TYPE_MOV;
-		//vm_arch_x86_regs[VM_X86_ECX] = data->pc+buf[1]+(buf[2]<<8)+(buf[3]<<16)+(buf[4]<<24);
+		//vm_arch_x86_regs[VM_X86_ECX] = asmdata->pc+buf[1]+(buf[2]<<8)+(buf[3]<<16)+(buf[4]<<24);
 		break;
 	case 0xba: // mov edx, <inmedate>
 		aop->type = R_ANAL_AOP_TYPE_MOV;
-		//vm_arch_x86_regs[VM_X86_EDX] = data->pc+buf[1]+(buf[2]<<8)+(buf[3]<<16)+(buf[4]<<24);
+		//vm_arch_x86_regs[VM_X86_EDX] = asmdata->pc+buf[1]+(buf[2]<<8)+(buf[3]<<16)+(buf[4]<<24);
 		break;
 	case 0xbb: // mov ebx, <inmedate>
 		aop->type = R_ANAL_AOP_TYPE_MOV;
-		//vm_arch_x86_regs[VM_X86_EBX] = data->pc+buf[1]+(buf[2]<<8)+(buf[3]<<16)+(buf[4]<<24);
+		//vm_arch_x86_regs[VM_X86_EBX] = asmdata->pc+buf[1]+(buf[2]<<8)+(buf[3]<<16)+(buf[4]<<24);
 		break;
 	case 0xbc: // mov esp, <inmedate>
 		aop->type = R_ANAL_AOP_TYPE_MOV;
-		//vm_arch_x86_regs[VM_X86_ESP] = data->pc+buf[1]+(buf[2]<<8)+(buf[3]<<16)+(buf[4]<<24);
+		//vm_arch_x86_regs[VM_X86_ESP] = asmdata->pc+buf[1]+(buf[2]<<8)+(buf[3]<<16)+(buf[4]<<24);
 		break;
 	case 0xbd: // mov esp, <inmedate>
 		aop->type = R_ANAL_AOP_TYPE_MOV;
-		//vm_arch_x86_regs[VM_X86_EBP] = data->pc+buf[1]+(buf[2]<<8)+(buf[3]<<16)+(buf[4]<<24);
+		//vm_arch_x86_regs[VM_X86_EBP] = asmdata->pc+buf[1]+(buf[2]<<8)+(buf[3]<<16)+(buf[4]<<24);
 		break;
 #if 0
 	case0xF
@@ -382,8 +383,8 @@ static int aop(struct r_asm_t *data, struct r_anal_aop_t *aop)
 			aop->type   = R_ANAL_AOP_TYPE_CJMP;
 			aop->length = 2;
 		//	aop->jump   = (unsigned long)((buf+2)+6);
-			aop->jump   = data->pc+bo+2; //(unsigned long)((buf+1)+5);
-			aop->fail   = data->pc+2;
+			aop->jump   = asmdata->pc+bo+2; //(unsigned long)((buf+1)+5);
+			aop->fail   = asmdata->pc+2;
 			aop->eob    = 1;
 			return 2;
 		}
@@ -392,7 +393,7 @@ static int aop(struct r_asm_t *data, struct r_anal_aop_t *aop)
 		//aop->type = R_ANAL_AOP_TYPE_UNK;
 	}
 
-	aop->length = data->inst_len;
+	aop->length = asmdata->inst_len;
 
 	if (!(aop->jump>>33))
 		aop->jump &= 0xFFFFFFFF; // XXX may break on 64 bits here
diff --git a/libr/core/cmd.c b/libr/core/cmd.c
index bcd200b362..fecb40a7c0 100644
--- a/libr/core/cmd.c
+++ b/libr/core/cmd.c
@@ -362,7 +362,7 @@ static int cmd_anal(void *data, const char *input)
 				ret = r_asm_disasm(&a, buf+idx, len-idx);
 				r_cons_printf("0x%08llx  %14s  %s\n",
 					core->seek+idx, a.buf_hex, a.buf_asm);
-				r_anal_aop(&core->anal, &a, &aop);
+				r_anal_aop(&core->anal, &aop, &a);
 				r_cons_printf("JUMP: 0x%08llx\n",
 					aop.jump);
 			}
diff --git a/libr/core/core.c b/libr/core/core.c
index 6f61063ecd..00dd33059a 100644
--- a/libr/core/core.c
+++ b/libr/core/core.c
@@ -73,7 +73,7 @@ int __lib_anl_cb(struct r_lib_plugin_t *pl, void *user, void *data)
 {
 	struct r_anal_handle_t *hand = (struct r_anal_handle_t *)data;
 	struct r_core_t *core = (struct r_core_t *)user;
-	//printf(" * Added language handler\n");
+	//printf(" * Added analysis handler\n");
 	r_anal_add(&core->anal, hand);
 	return R_TRUE;
 }
@@ -89,6 +89,7 @@ int r_core_init(struct r_core_t *core)
 	r_lang_init(&core->lang);
 	r_lang_set_user_ptr(&core->lang, core);
 	r_anal_init(&core->anal);
+	r_anal_set_user_ptr(&core->anal, core);
 	r_cons_init();
 	core->search = r_search_new(R_SEARCH_KEYWORD);
 	r_io_init(&core->io);
diff --git a/libr/include/r_anal.h b/libr/include/r_anal.h
index e13e4bf336..d0e3b9c124 100644
--- a/libr/include/r_anal.h
+++ b/libr/include/r_anal.h
@@ -4,7 +4,6 @@
 #define _INCLUDE_R_ANAL_H_
 
 #include "r_types.h"
-#include "r_asm.h"
 #include "list.h"
 
 enum {
@@ -108,7 +107,7 @@ struct r_anal_handle_t {
 	char *desc;
 	int (*init)(void *user);
 	int (*fini)(void *user);
-	int (*aop)(struct r_asm_t *data, struct r_anal_aop_t *aop);
+	int (*aop)(struct r_anal_aop_t *aop, void *data);
 	struct list_head list;
 };
 
@@ -118,7 +117,7 @@ void r_anal_set_user_ptr(struct r_anal_t *anal, void *user);
 int r_anal_add(struct r_anal_t *anal, struct r_anal_handle_t *foo);
 int r_anal_list(struct r_anal_t *anal);
 int r_anal_set(struct r_anal_t *anal, const char *name);
-int r_anal_aop(struct r_anal_t *anal, struct r_asm_t *data, struct r_anal_aop_t *aop);
+int r_anal_aop(struct r_anal_t *anal, struct r_anal_aop_t *aop, void *data);
 int r_anal_set_bits(struct r_anal_t *anal, int bits);
 int r_anal_set_big_endian(struct r_anal_t *anal, int boolean);