Cleaned up to direct to correct references