Edited out merge stuff