added new files, merged florian's changes