Changed some stuff in paplication main