Change basic setup

Changed values where needed