made it less shitty