cleaned up parameter scope
improved demo content