[@JrVader] Changes accepted, make sure to move them over.