updated commit with changes from november
updated commit with changes from november