Not q fix but additioN. V0.3 way too unfinishwd