Vor hardcore refactor
update with errors