took out old Constants