updates to 4a048eabdf3a7a59bb22fb37994c0655f29ad53a