techraising changes to be cleaned up