Forgot to add the * and fixed related bugs