minh's push with changes to back end