updated unicorn and forman for production