11.5.14 fixing bugs