Working just need to tune
Added steg