Changes after first testing