some changes to prev version