eb38612 Updates