Second attempt to get this to work.