Made changes as per tlimoncelli