Feature/fines