Yes, we can definitely move this to the FFC layer