Changed format passing, removed ugly big fat regex, should still work as before (hopefuly :/) .