[master] Fixed Code to be better setup