Pulled latest cottidie changes