merge try
merge
improvements for design and usability