some changes maded