Made this be not standalone and removed the instance of application