I'll have another version for you whenever my Internet is back. With your edits.