fixat mer stuff