Add new stuff for kagan test