Add bpz files; reduce duplicated logic in if/else

Add bpz files; reduce duplicated logic in if/else #131