Improvements for own update loop.