130610m 16:33 - made more changes