* updated to reflect some feedback