Forcing my last set of changes through