CR Fix & more custom