Added those freaks
Fixed conflicts