[Final] There are still some bugs running arround