Fixed Simon's issues.