Almost last update

Only one function left not bothering with specifics