changes made to avoid errors