call things correctly & wrap in map