combined the old files with the new setup