fixed logic, added launcher