stuff refact + inArr method added