Changed things to how they kinda should be...