Updated 

Updated core functionality