more changes to enterpicks template