Slight changes n stuff