Added FUN param
Added FUN param
Updated @inheritParams
Removed for loop
Added TODO