Before merge with Roni
After merge with Roni