More bugs on Final Version!