Implemented latest edits based on Tonys project