Updated with the new tickets @ebear has completed