Updates by FedPOffa