Moved two lines to allow to run on startup..