Added. found bugs O_o.