temp additions
fixes for new system