moved all into "boring" and "fun"