updated and working with express 3