current status... a bit more clean ;-)