Updated stuff.

Signed-off-by: Amrykid <amrykid@gmail.com>
Merge remote-tracking branch 'refs/remotes/origin/new-arch'