Fixes , need more fixes