update per comments - change if-else...