some more fixed