some changes to remove the exception that was in there