rc3 TODO added