Startup not being found
Merged changes