updates by Anthony Martinez