Changes for E1 model
clean source