a lot of changes maded