old project modifications merged in