WIP
some updates