Grabbing latest updates from 1.3