merging balint's updates