fixed TODO style / assigned to paraxor