Update features and Linh's