some changes, isnt working yet