Moved to make it more settings friendly