Refactored with R#