continued implementing the new update-function