just use prefixes from the get go
add step closure