updated for some changes