* Tedward's changes