Made script simpler