adding gabriel's updates