Some Slight feature changes