Refactoring + new quotes