I changed something else here. Please review @luKrossover