fixed up old express code