Merged with new changes