Modified to work with express