Roxygenized Florian's methods.