picking only required fields to reduce data size
sorry see you go (few changes to prev commit as well)