Updated shitty