merge with Gina's code