changes to add to tavirgeek's branch