modifications for first testing