diff --git a/make/BAPCMakefile b/make/BAPCMakefile
new file mode 100644
index 0000000..c4c88a9
--- /dev/null
+++ b/make/BAPCMakefile
@@ -0,0 +1,3 @@
+notes: problem_statement/notes.ipe
+	mkdir -p build
+	ipetoipe -pdf -export "problem_statement/notes.ipe" "build/notes.pdf"  2> /dev/null
diff --git a/make/ContestMakefile b/make/ContestMakefile
index 004d63d..77e6d73 100644
--- a/make/ContestMakefile
+++ b/make/ContestMakefile
@@ -3,9 +3,15 @@ TOOLS_MAKE_DIR=$(REPO_ROOT)/tools/make
 PROBLEMS=$(shell find -L . -mindepth 1 -maxdepth 1 -type d | sort)
 
 .PHONY: notes
-notes:
-	$(foreach p,$(PROBLEMS),'$(MAKE)' -C $(p) notes;)
-	pdfjam -q -o notes.pdf --fitpaper true --rotateoversize true $(foreach p,$(PROBLEMS),'$(p)/build/notes.pdf')
+notes: $(foreach p,$(PROBLEMS),$(p)/notes.pdf)
+	pdfjam --landscape -q -o notes.pdf $(foreach p,$(PROBLEMS),'$(p)/notes.pdf')
+
+%/notes.pdf: %
+	printf "Building notes for Problem $< with "
+	if [ -f "$</Makefile" ];\
+	then echo "make" && $(MAKE) -C "$<" notes && ln -sf build/notes.pdf "$</notes.pdf";\
+	else echo "bt" && bt solutions --problem "$<" && pdfjam --landscape -q -o "$</notes.pdf" "$</solution.en.pdf";\
+	fi
 
 .PHONY: clean
 clean: