faster, fixed some time things, new parse