Stop hardcoding Tom