added case 2 and fucked shit up