Updated first set of features