manually imported extra files due to github merging issues