Refactored origo to center