Changed much regarding parameters.. more todo