some updates unfinished yet