Finalised moving the model
Added element visibility
Added baum as suggestion