Merging first draft

Please merge our changes in