updated and little changes