complete select and map part