Initial revision from work