[PATCH] A3 overrides: Initial Commit