Fixed some parts 2