added discus and other things