updated 6.25 @ 14:15