CONTINUE works but should me improved