implemented fixes 11032014