Try to merge Brndiarova's work