Try merging Sivak's work