florian: implemented more stuff