Variable rename but it's still broken :(