[WIP] Address comments