updated to newest commits