making it less shitty