first batch of modified source code