changes to bring this prototype in order with remarks made yesterday
quick fix, because Bart needs this NOW.