moved TJY TODO to where it needs to be