edit issue
Micky's changes