Removed 'df' assumption