More code to be added
master continuation