Updated to newest commits