fixed & added