Tried to reorganize for A4