Fixed 3rd Refactor V1.2