checking in some feature changes