Reorganized a bit of code. "Tried" profile design