Moved stuff so it can be properly read