Fixed connor's shit