this change will suck... working on it