updated to new genric handlers