Changed my stupid mistakes