added 2nd method
fixed the hotfix
finished with iss53 issue
Hopefully resolved conflicts