Added: Hacked a bit to get better results