updated to include testing