started fixing santiation