[SOME+OF+MY+PATCH]