Updated to latest commits