Runnable version after redesign