Updated rest of features