Good Guys

Time to fix the mistakes