Trying to repair broken feature. Blame blondie if it doesnt work