I changed everything
merged with dev