- final updates with ugly hacks