GET to POST changed and nearly fixed