some changes to keep the same standard