Added Changes requested by tihmstar