changes to map fxn, etc.