Splitted script
Fixed conflicts