removed some shitty singularity
merge conflicts