added some basic changes in source