Synced up with amazon ubuntu1