global modifications and refactors