[PATCH 2/4] override-xd: Initial commit