Refs. #0001 - Continue