Updated to remove debug