up rev'ed all latest changes and additions