Better puzzle creation