cleaned up for 7.3