Changed Parameters a little bit