Did some work on 3.rs