WIP - try to solve settings timeout first