Brought back updates from main branch