* Integrated Charlie's changes manually