updated to use new system