more issue solving here