addressed comments and settled for dynamic mapping