still string comparison problem, removed some unnecessary stuff