Finished Al's update