major changes

client feedback for final review