Try to merge Zeler's work