last commit wrong, this is beter but still doest work