some more updated