final version - waiting for continue