Major Update

Imported other projects