Merged with your changes