Changed to one big script